Skip to content

Potential fix for CBL-8382 and reachability fix port from 4.0 - #1770

Merged
borrrden merged 1 commit into
release/4.1from
fix/ios_crash_and_reachability_fail
Jun 9, 2026
Merged

Potential fix for CBL-8382 and reachability fix port from 4.0#1770
borrrden merged 1 commit into
release/4.1from
fix/ios_crash_and_reachability_fail

Conversation

@borrrden

@borrrden borrrden commented Jun 9, 2026

Copy link
Copy Markdown
Member

No description provided.

@github-actions

github-actions Bot commented Jun 9, 2026 •
edited by borrrden
Loading

Copy link
Copy Markdown

This is a release branch and commits are restricted.

Please confirm this PR is one of the following:

  • A response to a customer ask
  • A change per our security policy
  • A non-functional change (i.e. changes needed for building an older version)
  • A change that has been granted an exception (please comment)

@borrrden

borrrden commented Jun 9, 2026

Copy link
Copy Markdown
Member Author

Forgotten port from 4.0

@borrrden
borrrden requested a review from pasin June 9, 2026 01:16
@borrrden
borrrden merged commit bf51baf into release/4.1 Jun 9, 2026
2 checks passed
@borrrden
borrrden deleted the fix/ios_crash_and_reachability_fail branch June 9, 2026 05:29
borrrden added a commit that referenced this pull request Jul 8, 2026
@borrrden
Merge release/4.1 into master (#1778)
4ade269 
* CBL-8393: Updated conflict resolution logic (#1767)

1. The local revid can be used as the winner now in local-wins cases
2. A merge body is only created when there is an actual merge

* Potential fix for CBL-8382 and reachability fix port from 4.0 (#1770)

* Update LiteCore to 4.1.0-98 (#1775)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pasin pasin pasin approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@borrrden @pasin